Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Force WG handshake each time the config is updated #7348

Merged
merged 4 commits into from
Dec 18, 2024
Merged

Conversation

dlon
Copy link
Member

@dlon dlon commented Dec 16, 2024

Fix DES-1563


This change is Reviewable

@dlon dlon force-pushed the establish-tun-before-pq branch 3 times, most recently from 05176d5 to f30ecf4 Compare December 16, 2024 12:48
@dlon dlon marked this pull request as ready for review December 16, 2024 12:50
Copy link
Contributor

@MarkusPettersson98 MarkusPettersson98 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 4 of 4 files at r1, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @dlon)


talpid-wireguard/src/connectivity/mod.rs line 9 at r1 (raw file):

mod pinger;

pub use check::Cancellable;

⛏️ Technically this should be gated on android or force_wireguard_handshake? 🫠

Code quote:

pub use check::Cancellable;

@dlon dlon force-pushed the establish-tun-before-pq branch from 91f3505 to c40765c Compare December 17, 2024 08:54
Copy link

linear bot commented Dec 17, 2024

Copy link
Contributor

@MarkusPettersson98 MarkusPettersson98 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 3 of 3 files at r2, all commit messages.
Reviewable status: all files reviewed, 2 unresolved discussions (waiting on @dlon)


talpid-wireguard/src/ephemeral.rs line 122 at r2 (raw file):

) -> Result<(), CloseMsg> {
    #[cfg(force_wireguard_handshake)]
    let _ = establish_tunnel_connection(tunnel, connectivity).await;

Would be nice with an explicit comment about why the return value is discarded. Obviously we care about the side effect of calling establish_tunnel_connection only.

Code quote:

    #[cfg(force_wireguard_handshake)]
    let _ = establish_tunnel_connection(tunnel, connectivity).await;

@dlon dlon force-pushed the establish-tun-before-pq branch from c40765c to aad3d12 Compare December 18, 2024 08:13
Copy link
Member Author

@dlon dlon left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: 3 of 6 files reviewed, 1 unresolved discussion (waiting on @MarkusPettersson98)


talpid-wireguard/src/ephemeral.rs line 122 at r2 (raw file):

Previously, MarkusPettersson98 (Markus Pettersson) wrote…

Would be nice with an explicit comment about why the return value is discarded. Obviously we care about the side effect of calling establish_tunnel_connection only.

Done.


talpid-wireguard/src/connectivity/mod.rs line 9 at r1 (raw file):

Previously, MarkusPettersson98 (Markus Pettersson) wrote…

⛏️ Technically this should be gated on android or force_wireguard_handshake? 🫠

(Merged them as suggested.)

Copy link
Contributor

@MarkusPettersson98 MarkusPettersson98 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 3 of 3 files at r3, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

Copy link
Contributor

@MarkusPettersson98 MarkusPettersson98 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:lgtm:

Reviewed 1 of 1 files at r4, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved

@dlon dlon force-pushed the establish-tun-before-pq branch from 613c466 to 86414a5 Compare December 18, 2024 08:44
@dlon dlon merged commit c6bdff0 into main Dec 18, 2024
53 checks passed
@dlon dlon deleted the establish-tun-before-pq branch December 18, 2024 08:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants